Fix remaining armor test failures #5130
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sleet01
commented
Feb 5, 2024
| @@ -251,6 +255,29 @@ public int getBAR() { | |||
| return bar; | |||
| } | |||
|
|
|||
| private static ArmorType createUnknownArmor() { | |||
There was a problem hiding this comment.
We used to have an "Unknown" armor type, which is still used in some tests / files. This should cover that option.
neoancient
approved these changes
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should allow the remaining failing unit tests to pass.
The issue is that the ArmorType types are not guaranteed to be initialized, because
ArmorType.initializeTypes()is only called fromEquipmentType.initializeTypes(), and that is only called in a few specific paths that rely on actually starting up the game itself.I've added a check in
ArmorType.of()that should avoid some infinite recursions as well.These fixes will allow tests to pass but are pretty fragile. It would be better to ensure that ArmorTypes are always initialized no matter what, but I'm not sure where would be best so I will leave that to others.